Merge from trunk.
authorStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 21:40:50 +0000 (23:40 +0200)
committerStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 21:40:50 +0000 (23:40 +0200)
commit62324485556cbd0c8342e5f683ae41ba203224c8
treea69a4a825175252838020677f51aaf68e3dab00d
parent14fbf2d783e651bb05c42e1c43af62ae85f2579d
parentbcedcb3a09674bd60710c74cbc60b599636a730a
Merge from trunk.